From d26ce5ce849735eaa8fe1b6e4dd5d66bd7821c9e Mon Sep 17 00:00:00 2001 From: "djm@kirby.fc.hp.com" Date: Fri, 29 Apr 2005 22:30:23 +0000 Subject: [PATCH] bitkeeper revision 1.1327.1.17 (4272b57fwJKUhFtJ5BrqVZ7CEFKwrA) Oops3 for more code cleanup --- .rootkeys | 1 + xen/arch/ia64/patch/linux-2.6.11/hpsim_ssc.h | 31 ++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 xen/arch/ia64/patch/linux-2.6.11/hpsim_ssc.h diff --git a/.rootkeys b/.rootkeys index 7895777148..f24cbca0ed 100644 --- a/.rootkeys +++ b/.rootkeys @@ -1086,6 +1086,7 @@ 425ae516Y1A4q4_Kfre3qnDj7lbHJg xen/arch/ia64/patch/linux-2.6.11/entry.S 425ae516txAP-owjzpTJ7ThfzWR8nw xen/arch/ia64/patch/linux-2.6.11/hardirq.h 425ae516PDO1ESDHXHVeDNvlqUfmdQ xen/arch/ia64/patch/linux-2.6.11/head.S +425ae516JR7HWvt1zxJ-wLvEWmJGgg xen/arch/ia64/patch/linux-2.6.11/hpsim_ssc.h 425ae516AHRNmaVuZjJY-9YjmKRDqg xen/arch/ia64/patch/linux-2.6.11/interrupt.h 425ae516U2wFUzrUJQUpy3z38jZHsQ xen/arch/ia64/patch/linux-2.6.11/io.h 425ae516GGRmXijPBLC5ii6yWOn0rg xen/arch/ia64/patch/linux-2.6.11/irq_ia64.c diff --git a/xen/arch/ia64/patch/linux-2.6.11/hpsim_ssc.h b/xen/arch/ia64/patch/linux-2.6.11/hpsim_ssc.h new file mode 100644 index 0000000000..421644b0f7 --- /dev/null +++ b/xen/arch/ia64/patch/linux-2.6.11/hpsim_ssc.h @@ -0,0 +1,31 @@ + hpsim_ssc.h | 19 +++++++++++++++++++ + 1 files changed, 19 insertions(+) + +Index: linux-2.6.11/arch/ia64/hp/sim/hpsim_ssc.h +=================================================================== +--- linux-2.6.11.orig/arch/ia64/hp/sim/hpsim_ssc.h 2005-03-02 01:38:17.000000000 -0600 ++++ linux-2.6.11/arch/ia64/hp/sim/hpsim_ssc.h 2005-03-19 13:34:01.705520375 -0600 +@@ -33,4 +33,23 @@ + */ + extern long ia64_ssc (long arg0, long arg1, long arg2, long arg3, int nr); + ++#ifdef XEN ++/* Note: These are declared in linux/arch/ia64/hp/sim/simscsi.c but belong ++ * in linux/include/asm-ia64/hpsim_ssc.h, hence their addition here */ ++#define SSC_OPEN 50 ++#define SSC_CLOSE 51 ++#define SSC_READ 52 ++#define SSC_WRITE 53 ++#define SSC_GET_COMPLETION 54 ++#define SSC_WAIT_COMPLETION 55 ++ ++#define SSC_WRITE_ACCESS 2 ++#define SSC_READ_ACCESS 1 ++ ++struct ssc_disk_req { ++ unsigned long addr; ++ unsigned long len; ++}; ++#endif ++ + #endif /* _IA64_PLATFORM_HPSIM_SSC_H */ -- 2.30.2